If allowed, create and remove /usr/local/share/emacs/site-lisp.

diff --git a/debian/changelog b/debian/changelog
index c3e2301e2fc15f9d5ac5d6e71bfc3255abaa523b..81a9cb4340b7b99e4a7c1a8ed32687e3d3d9dc17 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ emacs22 (22.1+1-1) unstable; urgency=low
 
   * Change build dependency from libpng3-dev to libpng12-dev.
     (closes: #424622) [rlb]
+
+  * If allowed, create and remove non-flavor-specific
+    /usr/local/share/emacs/site-lisp.
   
- -- Rob Browning <rlb@defaultvalue.org>  Wed, 04 Jul 2007 23:32:47 -0700
+ -- Rob Browning <rlb@defaultvalue.org>  Wed, 04 Jul 2007 23:36:10 -0700
 
 emacs22 (22.0.99+1-1) experimental; urgency=low
 

diff --git a/debian/emacsVER-common.postinst b/debian/emacsVER-common.postinst
index f4c5d654788f9de36a51a37c466fd514cf3a5e5c..59c90d0b7ffa8b926cf46865995c3e30403369c6 100644 (file)
--- a/debian/emacsVER-common.postinst
+++ b/debian/emacsVER-common.postinst
@@ -14,6 +14,18 @@ done
 
 # Create the site-lisp dir for this flavor if we're allowed
 
+parentdir=/usr/local/share/emacs
+newdir=site-lisp
+
+if [ -d ${parentdir} ]
+then
+  if mkdir ${parentdir}/${newdir} 2>/dev/null
+  then
+    chown root:staff ${parentdir}/${newdir}
+    chmod 2775 ${parentdir}/${newdir}
+  fi
+fi
+
 parentdir=/usr/local/share/emacs
 newdir=${FULL}
 

diff --git a/debian/emacsVER-common.prerm b/debian/emacsVER-common.prerm
index b1aefd4364e910b7e7cee5b5fbb79e9cd65b857a..33df9350727efb28fa38b040715876eab0c7d514 100644 (file)
--- a/debian/emacsVER-common.prerm
+++ b/debian/emacsVER-common.prerm
@@ -15,7 +15,11 @@ done
 
 # emacsen-common/emacs-remove used to be here.
 
-(rmdir /usr/local/share/emacs/${FULL}/site-lisp 2>/dev/null && \
- rmdir /usr/local/share/emacs/${FULL}           2>/dev/null) || true
+set +e
+# Only remove these directories if they're empty.
+rmdir /usr/local/share/emacs/${FULL}/site-lisp 2>/dev/null
+rmdir /usr/local/share/emacs/${FULL} 2>/dev/null
+rmdir /usr/local/share/emacs/site-lisp 2>/dev/null
+set -e
 
 #DEBHELPER#